Trying to create a branch review for a changeset that has had a branch removed recently might pick the removed branch and show a Internal Server Error

HTR:

1. Push a commit on a branch (in git)
2. Create a new branch for the commit, remove the old branch
3. Try creating a review for the branch (via the cog menu), while the new branch is being indexed

Expected:

1. Either an existing branch is picked in favor of the removed one, or a friendly error message is shown

Actual:

1. Red "internal server error" pops up

   2015-02-03 11:01:50,882 ERROR [qtp715504968-3211 ] com.atlassian.crucible.plugins.branchreview.rest.provider.ExceptionExceptionMapper noClassMethodInfo - Exception thrown during REST request:Branch '3.6-FE-5525-skip-querying-commiter-mappings-on-viewdir@null' doesn't ha
   ve last changeset set. Branch was deleted? User: null Referrer:null
   java.lang.IllegalStateException: Branch '3.6-FE-5525-skip-querying-commiter-mappings-on-viewdir@null' doesn't have last changeset set. Branch was deleted?
           at com.google.common.base.Preconditions.checkState(Preconditions.java:172)
           at com.atlassian.crucible.plugins.branchreview.service.DefaultBranchReviewService.getLatestChangeSetId(DefaultBranchReviewService.java:330)
           at com.atlassian.crucible.plugins.branchreview.service.DefaultBranchReviewService.access$100(DefaultBranchReviewService.java:55)
           at com.atlassian.crucible.plugins.branchreview.service.DefaultBranchReviewService$1.apply(DefaultBranchReviewService.java:231)
           at com.atlassian.crucible.plugins.branchreview.service.DefaultBranchReviewService$1.apply(DefaultBranchReviewService.java:226)
           at com.cenqua.fisheye.rep.RepositoryHandle.withEngine(RepositoryHandle.java:507)
           at com.atlassian.crucible.plugins.branchreview.service.DefaultBranchReviewService.listBranchCommits(DefaultBranchReviewService.java:226)
           at com.atlassian.crucible.plugins.branchreview.rest.BranchReviewResource.listBranchCommits(BranchReviewResource.java:116)
           at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
           at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
           at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
           at java.lang.reflect.Method.invoke(Method.java:483)
           at com.atlassian.plugins.rest.common.interceptor.impl.DispatchProviderHelper$TypeOutInvoker$1.invoke(DispatchProviderHelper.java:205)
           at com.atlassian.plugins.rest.common.interceptor.impl.DispatchProviderHelper$1.intercept(DispatchProviderHelper.java:100)
           at com.atlassian.plugins.rest.common.interceptor.impl.DefaultMethodInvocation.invoke(DefaultMethodInvocation.java:61)
           at com.atlassian.plugins.rest.common.expand.interceptor.ExpandInterceptor.intercept(ExpandInterceptor.java:38)
           at com.atlassian.plugins.rest.common.interceptor.impl.DefaultMethodInvocation.invoke(DefaultMethodInvocation.java:61)
           at com.atlassian.plugins.rest.common.interceptor.impl.DispatchProviderHelper.invokeMethodWithInterceptors(DispatchProviderHelper.java:132)
           at com.atlassian.plugins.rest.common.interceptor.impl.DispatchProviderHelper$TypeOutInvoker._dispatch(DispatchProviderHelper.java:201)
           at com.sun.jersey.server.impl.model.method.dispatch.ResourceJavaMethodDispatcher.dispatch(ResourceJavaMethodDispatcher.java:75)
           at com.sun.jersey.server.impl.uri.rules.HttpMethodRule.accept(HttpMethodRule.java:288)
           at com.sun.jersey.server.impl.uri.rules.RightHandPathRule.accept(RightHandPathRule.java:147)
           at com.sun.jersey.server.impl.uri.rules.ResourceClassRule.accept(ResourceClassRule.java:108)
           at com.sun.jersey.server.impl.uri.rules.RightHandPathRule.accept(RightHandPathRule.java:147)
           at com.sun.jersey.server.impl.uri.rules.RootResourceClassesRule.accept(RootResourceClassesRule.java:84)
           at com.sun.jersey.server.impl.application.WebApplicationImpl._handleRequest(WebApplicationImpl.java:1469)
           at com.sun.jersey.server.impl.application.WebApplicationImpl._handleRequest(WebApplicationImpl.java:1400)
           at com.sun.jersey.server.impl.application.WebApplicationImpl.handleRequest(WebApplicationImpl.java:1349)
           at com.sun.jersey.server.impl.application.WebApplicationImpl.handleRequest(WebApplicationImpl.java:1339)