/*
 * Copyright 2014 Google. Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.google.k2crypto.storage;

import com.google.k2crypto.K2Exception;

/**
 * Exception thrown when there is an issue with an operation on a {@link Store}. 
 * 
 * @author darylseah@gmail.com (Daryl Seah)
 */
public class StoreException extends K2Exception {
        
  private Store store = null;
  
  /**
   * Constructs a new StoreException with the specified message.
   *
   * @param message The detail message.
   */
  public StoreException(String message) {
    super(message);
  }
  
  /**
   * Constructs a new StoreException with the specified message and cause.
   *
   * @param message The detail message.
   * @param cause The cause of this exception.
   */
  public StoreException(String message, Throwable cause) {
    super(message, cause);
  }
  
  /**
   * Sets the store that the exception occurred on.
   * 
   * @param store Store that triggered the exception.
   */
  void setStore(Store store) {
    this.store = store;
  }
  
  /**
   * Returns the store that the exception occurred on.
   */
  public Store getStore() {
    return store;
  }
  
  /**
   * Returns the message augmented with store location information.
   */
  @Override
  public String getMessage() {
    Store store = this.store;
    if (store == null) {
      return super.getMessage();
    }
    return super.getMessage() + " @" + store;
  }
}

@@ -1509,24 +1509,140 @@
 re store) %7B%0A
+    if (this.store != null) %7B%0A      throw new IllegalStateException(%22Exception already has store assigned.%22);%0A    %7D%0A
     this.sto

Add check for double store assignment.