Catch extra argument exception for storage

Change-Id: I3a2b7eeb91fa32934433321157ec74be91dcf079